Merge version 2.14~git20250718.0e36779-2+rpi1 and 2.14-2 to produce 2.14-2+rpi1

diff --cc debian/changelog
index 3e0d321a86fe77aaa0eeb9b8cb3b38ccff87ef84,140e9072086daee9c055bbca3ef544b2258425c1..70fe1461d58f355e96e7bc97e234e6f9131e2200
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,40 +1,49 @@@
- grub2 (2.14~git20250718.0e36779-2+rpi1) forky-staging; urgency=medium
++grub2 (2.14-2+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 2.12-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 28 Jul 2024 22:42:11 +0000]
 +  * Treat system as Debian, since we don't have any specific config for
 +    raspbian.
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 01 Feb 2026 12:27:55 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 21 Apr 2026 05:33:57 +0000
++
+ grub2 (2.14-2) unstable; urgency=medium
+ 
+   [ Mate Kukri ]
+   * grub-common.service: Add After/Requires=boot-complete.target
+   * Provide pre-built BIOS and IEEE1275 El-Torito images
+   * Drop vt-handoff support (LP #2052673)
+ 
+   [ Julian Andres Klode ]
+   * debian/upstream/signing-key.asc: merge keyring
+ 
+   [ Mate Kukri ]
+   * Do not append file/function/line prefixes to GRUB error message
+   * efi: Drop support for UGA Draw and Console Control protocols (Closes: #1127371) (Closes: #1127556)
+ 
+  -- Mate Kukri <mate.kukri@canonical.com>  Tue, 10 Feb 2026 11:27:19 +0000
+ 
+ grub2 (2.14-1) unstable; urgency=medium
+ 
+   [ Aaron Rainbolt ]
+   * Disable grub-extras/ntldr-img (Closes: #1122127)
+ 
+   [ Mate Kukri ]
+   * Import new upstream 2.14 release
+   * Rebase patches on new upstream 2.14 release
+   * d/control: Add autoconf-archive to build depends
+   * d/p: Do not check for autoconf-archive, the check is broken
+   * d/p: Do not use --image-base for linking, unbreak grub-pc
+   * d/rules: Add zfs_zstd_test to XFAIL_TESTS
+   * d/rules: Remove iso9660_test from XFAIL_TESTS
+ 
+   [ Heinrich Schuchardt ]
+   * debian: enable FLICKER_FREE_BOOT for riscv64
+ 
+   [ Askar Safin ]
+   * Don't use all_video by default on UEFI (Closes: #1036019)
+ 
+  -- Mate Kukri <mate.kukri@canonical.com>  Thu, 05 Feb 2026 10:50:50 +0000
  
  grub2 (2.14~git20250718.0e36779-2) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge